2 Commits (addfb21a94fb4e6b9d07b270f7bb3748767a8f38)

Author SHA1 Message Date
David Aguilar 1e86d5b11d mergetools: stop setting $status in merge_cmd() 10 years ago
Stefan Saasen c5f424fd01 mergetools/diffmerge: support DiffMerge as a git mergetool 12 years ago