summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jörg Sommer <joerg@alea.gnuu.de>2008-05-05 11:06:49 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-05 17:30:23 -0700
commit2b3e60c245684fd68bab36c07fee9888ff24f4b4 (patch)
tree499941d0bce4c88f1b21aa2a1446c369b5338012 /Documentation/git-merge-file.txt
parentDocumentation: Add create-ignore to git svn manual (diff)
downloadtgif-2b3e60c245684fd68bab36c07fee9888ff24f4b4.tar.xz
post-merge: Add it's not executed if merge failed.
Signed-off-by: J��rg Sommer <joerg@alea.gnuu.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions