diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-17 16:55:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-17 16:55:46 -0700 |
| commit | 35812d830579643f898979be479b6fee5f7c7b38 (patch) | |
| tree | 661e58853ae6b9541f1a63b97ad9db5a87809c8a /git-pull.sh | |
| parent | Add --ignore-unmatch option to exit with zero status when no files are removed. (diff) | |
| parent | t3030: merge-recursive backend test. (diff) | |
| download | tgif-35812d830579643f898979be479b6fee5f7c7b38.tar.xz | |
Merge branch 'jc/read-tree-df'
* jc/read-tree-df:
t3030: merge-recursive backend test.
merge-recursive: handle D/F conflict case more carefully.
merge-recursive: do not barf on "to be removed" entries.
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
t1000: fix case table.
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions