diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:05:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:05:38 -0700 |
| commit | 79e539404c016e894d8a4db8f43762842a066afc (patch) | |
| tree | da07cd8e80c23c5c089ab1042c9e95d7bb1d6083 /git-merge-resolve.sh | |
| parent | Sync with maint (diff) | |
| parent | patch-id-test: test stable and unstable behaviour (diff) | |
| download | tgif-79e539404c016e894d8a4db8f43762842a066afc.tar.xz | |
Merge branch 'mt/patch-id-stable' (early part)
* 'mt/patch-id-stable' (early part):
patch-id-test: test stable and unstable behaviour
patch-id: make it stable against hunk reordering
test doc: test_write_lines does not split its arguments
test: add test_write_lines helper
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions