diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-19 13:45:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-19 13:45:01 -0700 |
| commit | 6ae5d9863ba13b5d138851d8e622c9ed05313966 (patch) | |
| tree | dbd24f2f5d334f6348a83b99f1039b2c8a44c5d8 /git-merge-resolve.sh | |
| parent | Merge branch 'mv/sequencer-pick-error-diag' (diff) | |
| parent | t6200: avoid path mangling issue on Windows (diff) | |
| download | tgif-6ae5d9863ba13b5d138851d8e622c9ed05313966.tar.xz | |
Merge branch 'rt/commentchar-fmt-merge-msg'
A test fix for recent update.
* rt/commentchar-fmt-merge-msg:
t6200: avoid path mangling issue on Windows
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions