summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-17 23:55:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-17 23:55:46 (GMT)
commit35812d830579643f898979be479b6fee5f7c7b38 (patch)
tree661e58853ae6b9541f1a63b97ad9db5a87809c8a /git-gui/git-gui.sh
parentbb1faf0d5bc53b193bbe25e7425458c8eb85efa3 (diff)
parent885b98107547fe3f6d17ca0af0578e040f7600d0 (diff)
downloadgit-35812d830579643f898979be479b6fee5f7c7b38.zip
git-35812d830579643f898979be479b6fee5f7c7b38.tar.gz
git-35812d830579643f898979be479b6fee5f7c7b38.tar.bz2
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-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions