Mercurial > hg-stable
graph
-
merge: show renamed on one and deleted on the other side in debug outputWed, 23 May 2012 21:34:29 +0200, by Thomas Arendsen Hein
-
merge: warn about file deleted in one branch and renamed in other (issue3074)Wed, 23 May 2012 20:50:16 +0200, by Thomas Arendsen Hein
-
tests: do not create repos inside repos in test-rename-merge1.tWed, 23 May 2012 17:33:19 +0200, by Thomas Arendsen Hein
-
merge: do not warn about copy and rename in the same transaction (issue2113)Wed, 23 May 2012 17:25:48 +0200, by Thomas Arendsen Hein
-
merge with stableWed, 30 May 2012 14:21:58 -0500, by Matt Mackall