log tests/test-issue1802.t @ 18849:b4ddc43ddf9d

age author description
Fri, 08 Feb 2013 15:23:23 +0000 Siddharth Agarwal manifestmerge: pass in branchmerge and force separately
Thu, 10 Jan 2013 00:44:23 +0100 Mads Kiilerich merge: changing the mode of a file is also an update
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Mon, 07 Nov 2011 03:14:54 +0100 Mads Kiilerich tests: use 'hghave execbit' for tests that manipulate x bit in file system
Sat, 22 Oct 2011 16:12:33 -0500 Matt Mackall windows: recompute flags when committing a merge (issue1802) stable