projects
/
feisty_meow.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
941e5729d5f04c7f36682e27e5582d3bc8771b5d
[feisty_meow.git]
/
scripts
/
rev_control
/
resolve_svn.sh
1
#!/bin/bash
2
3
# resolves a tree conflict by accepting the "working" version,
4
# which effectively makes your current change the accepted one.
5
6
filename="$1"; shift
7
8
svn resolve --accept=working "$filename"
9
10