Wed, 12 Oct 2016 12:22:18 +0200 | Mads Kiilerich | merge: only show "cannot merge flags for %s" warning if flags are different | file | diff | annotate |
Sun, 02 Oct 2016 17:31:32 +0900 | Yuya Nishihara | merge: update doc of manifestmerge() per 18c2184c27dc | file | diff | annotate |
Sat, 08 Oct 2016 01:25:28 -0700 | Simon Farnsworth | merge: use labels in subrepo merge | file | diff | annotate |
Tue, 30 Aug 2016 09:22:53 -0700 | Martin von Zweigbergk | util: rename checkcase() to fscasesensitive() (API) | file | diff | annotate |
Tue, 23 Aug 2016 17:58:53 -0700 | Siddharth Agarwal | merge: remove files with extra actions from merge action list | file | diff | annotate |
Fri, 12 Aug 2016 05:56:40 -0700 | Simon Farnsworth | merge: always use other, not remote, in user prompts | file | diff | annotate |