diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:12 -0700 |
| commit | ef92392b6c8596b61eab6f2045a54c086f340cf7 (patch) | |
| tree | 961a30992de888f4fd135507cb33ebf1f6bfcf56 /Documentation/git-mergetool--lib.txt | |
| parent | 91feb387f2cba906a233c3683cfa5ff2bc32d79a (diff) | |
| parent | 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 (diff) | |
| download | git-ef92392b6c8596b61eab6f2045a54c086f340cf7.tar.gz | |
Merge branch 'ph/stash-rerere' into maint-1.7.11
* ph/stash-rerere:
stash: invoke rerere in case of conflict
test: git-stash conflict sets up rerere
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions