Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 19226:c58b6ab4c26f
| age | author | description |
|---|---|---|
| Wed, 22 May 2013 17:31:43 -0500 | Matt Mackall | ui: merge prompt text components into a singe string |
| Wed, 08 May 2013 14:11:01 -0700 | Siddharth Agarwal | manifestmerge: local unknown, remote created: don't traverse symlinks |
| Tue, 30 Apr 2013 05:01:32 +0900 | FUJIWARA Katsunori | icasefs: rewrite case-folding collision detection (issue3452) stable |
| Mon, 29 Apr 2013 15:58:15 +0900 | FUJIWARA Katsunori | merge: increase safety of parallel updating/removing on icasefs stable |
| Tue, 16 Apr 2013 15:33:18 +0200 | Pierre-Yves David | update: allow dirty update to foreground (successors) |
| Wed, 10 Apr 2013 12:34:42 -0700 | Siddharth Agarwal | manifestmerge: handle workdir removed, remote removed with flags |
| Thu, 04 Apr 2013 16:37:37 -0500 | Matt Mackall | merge with stable |