2 ms·
What is it that you can do in git, that you can't do in Mercurial?
by imakesnowflakes 12y ago
What is it that you can do in git, that you can't do in Mercurial?
- bsder 12y agoStop. You can't argue with git fanboys. git is the One True Way(tm). Windows doesn't exist. Linus (praised be his name) says so.
- kinghajj 12y agoI believe one piece still missing is the full functionality provided by the index in Git. There is the record extension, but IIRC that doesn't emulate one of the index's greatest features: during a merge/rebase, non-conflicting changes are already staged, so "git diff" shows only conflicts (and "git diff --cached" shows those changes that merged successfully).
- imakesnowflakes 12y agoMercurial does this, and you only have to manually resolve conflicting changes during a merge/rebase. See here http://mercurial.selenic.com/wiki/MergeToolConfiguration http://mercurial.selenic.com/wiki/MergeToolConfiguration I think you might have tried this on a instance of Mercurial where the "premerge" option of the merge tool has been turned off for some reason..