diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:56:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:56:51 -0700 |
commit | a3402c18b66347a9357cdb1af5a581f1ecc5264d (patch) | |
tree | c9dc4985d31c622d7f3058f30a979d280633653f /t/t6037-merge-ours-theirs.sh | |
parent | git-add.txt: document 'add.ignoreErrors' (diff) | |
parent | sha1_name: Suggest commit:./file for path in subdir (diff) | |
download | tgif-a3402c18b66347a9357cdb1af5a581f1ecc5264d.tar.xz |
Merge branch 'mg/sha1-path-advise' into maint
* mg/sha1-path-advise:
sha1_name: Suggest commit:./file for path in subdir
t1506: factor out test for "Did you mean..."
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions