Mercurial > hg-stable
graph
-
merge: tool.check = prompt will force an interactive merge checkMon, 10 May 2010 11:04:56 -0500, by David Champion
-
merge: introduce tool.check parameterMon, 10 May 2010 11:04:56 -0500, by David Champion
-
give worst-case 'merge' merge-tool lowest priorityWed, 21 Apr 2010 12:02:51 -0500, by David Champion
-
merge: tool.premerge=keep will leave premerge markers in $localWed, 21 Apr 2010 11:57:45 -0500, by David Champion
-
merge with mpmTue, 11 May 2010 20:22:37 +0200, by Benoit Boissinot
-
merge with stableTue, 11 May 2010 20:21:25 +0200, by Benoit Boissinot
-
context: fallback function should not return None stableTue, 11 May 2010 20:13:52 +0200, by Benoit Boissinot
-
test-subrepo-svn: fix strange svn behaviour on windowsMon, 10 May 2010 22:52:28 +0200, by Patrick Mezard