Mercurial > hg
log mercurial/merge.py @ 20945:18adc15635a1
| age | author | description |
|---|---|---|
| Sun, 02 Mar 2014 18:52:16 +0100 | Mads Kiilerich | merge: keep destination filename as key in filemerge actions |
| Sun, 02 Mar 2014 18:49:36 +0100 | Mads Kiilerich | merge: keep destination filename as key in actions for merge with dir rename |
| Fri, 28 Feb 2014 02:38:33 +0100 | Mads Kiilerich | merge: include ancestor node in merge actions |
| Tue, 25 Feb 2014 20:30:08 +0100 | Mads Kiilerich | merge: use ancestor filename from planning phase instead of filectx ancestor |
| Tue, 01 Apr 2014 15:11:19 -0500 | Matt Mackall | merge with stable |
| Tue, 01 Apr 2014 02:46:03 +0900 | FUJIWARA Katsunori | i18n: fix "% inside _()" problems stable |
| Tue, 01 Apr 2014 02:46:03 +0900 | FUJIWARA Katsunori | merge: fix lack of "%s" in format string causing TypeError at runtime stable |