branch: deprecate --set-upstream and show help if we detect possible mistaken use
[gitweb.git] / mergetools / bc3
2011-08-19 mergetool--lib: Refactor tools into separate files