Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 867:0cd2ee61b10a
Allow Mercurial to build on HP-UX 11
Temporary fix to allow Mercurial to build on HP-UX 11, as the C
compiler on HP-UX 11 doesn't support 'inline' qualifier. The
'__inline' qualifier seemed to be supported, but not without
first resolving other associated issues.
author | tksoh@users.sourceforge.net |
---|---|
date | Sat, 13 Aug 2005 12:41:00 -0800 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add b + hg commit -m commit #2 -d 0 0 + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg commit -A -m commit #2 -d 0 0 adding b + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg remove b + hg update 0 + hg commit -A -m commit #2 -d 0 0 adding b