merge-one-file: use empty- or common-base condintionally in two-stage merge.
[gitweb.git] / shell.c
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-24 Add git-shell.