| 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
|
| Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: mark mergestate as dirty when resolve changes _state
|
| Wed, 05 Mar 2014 10:49:43 -0800 |
Pierre-Yves David |
merge: adds documentation to the mergestate class
|
| Wed, 05 Mar 2014 10:22:43 -0800 |
Pierre-Yves David |
merge: add blank line between mergestate's method
|
| Tue, 25 Feb 2014 20:29:46 +0100 |
Mads Kiilerich |
merge: use the right ancestor when both sides copied the same file
|
| Sun, 02 Mar 2014 18:36:02 +0100 |
Mads Kiilerich |
merge: handle create+delete prompts in calculateupdates
|
| Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: handle acceptremove of create+delete early in manifest merge
|
| Sat, 01 Mar 2014 21:08:28 -0500 |
Augie Fackler |
merge with stable
|
