Mercurial > hg > mercurial-crew-with-dirclash
diff tests/fish-merge @ 149:8cd45e152c83
Pass filename to $HGMERGE
This lets the merge program be slightly more user-friendly
author | mpm@selenic.com |
---|---|
date | Tue, 24 May 2005 23:34:06 -0800 |
parents | 9f64ee817199 |
children | 3d4d5f2aba9a 4fc63e22b1fe |