Mercurial > hg > mercurial-crew-with-dirclash

log hgmerge @ 5477:f00ed7c5877b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -7 tip
age author description
Wed, 15 Aug 2007 17:27:51 +0200 Sascha Wilde Use smerge minor mode in emacs to resolve conflicts.
Sun, 08 Jul 2007 13:44:41 +0200 Thomas Arendsen Hein Check for conflict markers in hgmerge (issue471)
Fri, 07 Apr 2006 22:31:54 +0200 Radoslaw Szkodzinski Try to use /usr/bin/test or /bin/test to work around missing features. 0.8.1
Sat, 11 Mar 2006 21:33:19 -0800 Vadim Gelfer run merge program in repo root.
Fri, 10 Mar 2006 23:34:36 -0800 Vadim Gelfer merge with self.
Fri, 10 Mar 2006 23:34:02 -0800 Vadim Gelfer give more info to hgmerge script.
Fri, 10 Mar 2006 23:25:50 -0800 Vadim Gelfer undo edit that was accident.
less more | (0) -30 -10 -7 tip