summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-01-15 22:22:23 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-01-15 22:22:23 -0800
commit8a263aeb4f913e04e18248eb4d370157f1d253e6 (patch)
tree9cec4e555400d7df29d9c110f9ac12abed8ae110 /git-merge-resolve.sh
parentGIT 1.1.2 (diff)
parentdescribe: omit clearing marks on the last one. (diff)
parentGIT 1.0.11 (diff)
downloadtgif-8a263aeb4f913e04e18248eb4d370157f1d253e6.tar.xz
GIT 1.1.3